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_ns/ipprofile_2vm_nsd.yaml

-nsd:
-  nsd:
-  - description: NS with 1 VNFs connected by mgmtnet VL
-    df:
-    - id: default-df
-      vnf-profile:
-      - id: '1'
-        virtual-link-connectivity:
-        - constituent-cpd-id:
-          - constituent-base-element-id: '1'
-            constituent-cpd-id: vnf-mgmt-ext
-          virtual-link-profile-id: mgmtnet
-        vnfd-id: ipprofile_2vm-vnf
-    id: ipprofile_2vm-ns
-    name: ipprofile_2vm-ns
-    version: '1.0'
-    virtual-link-desc:
-    - id: mgmtnet
-      mgmt-network: true
-    vnfd-id:
-    - ipprofile_2vm-vnf
+nsd:
+  nsd:
+  - description: NS with 1 VNFs connected by mgmtnet VL
+    df:
+    - id: default-df
+      vnf-profile:
+      - id: '1'
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: '1'
+            constituent-cpd-id: vnf-mgmt-ext
+          virtual-link-profile-id: mgmtnet
+        vnfd-id: ipprofile_2vm-vnf
+    id: ipprofile_2vm-ns
+    name: ipprofile_2vm-ns
+    version: '1.0'
+    virtual-link-desc:
+    - id: mgmtnet
+      mgmt-network: true
+    vnfd-id:
+    - ipprofile_2vm-vnf

ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml

-vnfd:
-  description: A VNF consisting of 2 VDUs connected to an internal VL
-  df:
-  - id: default-df
-    instantiation-level:
-    - id: default-instantiation-level
-      vdu-level:
-      - number-of-instances: 1
-        vdu-id: mgmtVM
-      - number-of-instances: 1
-        vdu-id: dataVM
-    vdu-profile:
-    - id: mgmtVM
-      min-number-of-instances: 1
-    - id: dataVM
-      min-number-of-instances: 1
-    virtual-link-profile:
-    - id: internal
-      flavour: ''
-      virtual-link-protocol-data:
-        l3-protocol-data:
-          cidr: 192.168.200.0/24
-          ip-version: ipv4
-  ext-cpd:
-  - id: vnf-mgmt-ext
-    int-cpd:
-      cpd: mgmtVM-eth0-int
-      vdu-id: mgmtVM
-  id: ipprofile_2vm-vnf
-  int-virtual-link-desc:
-  - id: internal
-  mgmt-cp: vnf-mgmt-ext
-  product-name: ipprofile_2vm-vnf
-  sw-image-desc:
-  - id: ubuntu20.04
-    image: ubuntu20.04
-    name: ubuntu20.04
-  vdu:
-  - id: mgmtVM
-    int-cpd:
-    - id: mgmtVM-eth0-int
-      virtual-network-interface-requirement:
-      - name: mgmtVM-eth0
-        position: 1
-        virtual-interface:
-          type: PARAVIRT
-    - id: mgmtVM-eth1-int
-      int-virtual-link-desc: internal
-      virtual-network-interface-requirement:
-      - name: mgmtVM-eth1
-        position: 2
-        virtual-interface:
-          type: PARAVIRT
-    name: mgmtVM
-    sw-image-desc: ubuntu20.04
-    virtual-compute-desc: mgmtVM-compute
-    virtual-storage-desc:
-    - mgmtVM-storage
-  - id: dataVM
-    int-cpd:
-    - id: dataVM-eth0-int
-      int-virtual-link-desc: internal
-      virtual-network-interface-requirement:
-      - name: dataVM-eth0
-        position: 1
-        virtual-interface:
-          type: PARAVIRT
-    name: dataVM
-    sw-image-desc: ubuntu20.04
-    virtual-compute-desc: dataVM-compute
-    virtual-storage-desc:
-    - dataVM-storage
-  version: '1.0'
-  virtual-compute-desc:
-  - id: mgmtVM-compute
-    virtual-memory:
-      size: 1.0
-    virtual-cpu:
-      num-virtual-cpu: 1
-  - id: dataVM-compute
-    virtual-memory:
-      size: 1.0
-    virtual-cpu:
-      num-virtual-cpu: 1
-  virtual-storage-desc:
-  - id: mgmtVM-storage
-    size-of-storage: 10
-  - id: dataVM-storage
-    size-of-storage: 10
+vnfd:
+  description: A VNF consisting of 2 VDUs connected to an internal VL
+  df:
+  - id: default-df
+    instantiation-level:
+    - id: default-instantiation-level
+      vdu-level:
+      - number-of-instances: 1
+        vdu-id: mgmtVM
+      - number-of-instances: 1
+        vdu-id: dataVM
+    vdu-profile:
+    - id: mgmtVM
+      min-number-of-instances: 1
+    - id: dataVM
+      min-number-of-instances: 1
+    virtual-link-profile:
+    - id: internal
+      flavour: ''
+      virtual-link-protocol-data:
+        l3-protocol-data:
+          cidr: 192.168.200.0/24
+          ip-version: ipv4
+  ext-cpd:
+  - id: vnf-mgmt-ext
+    int-cpd:
+      cpd: mgmtVM-eth0-int
+      vdu-id: mgmtVM
+  id: ipprofile_2vm-vnf
+  int-virtual-link-desc:
+  - id: internal
+  mgmt-cp: vnf-mgmt-ext
+  product-name: ipprofile_2vm-vnf
+  sw-image-desc:
+  - 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:
+    - id: mgmtVM-eth0-int
+      virtual-network-interface-requirement:
+      - name: mgmtVM-eth0
+        position: 1
+        virtual-interface:
+          type: PARAVIRT
+    - id: mgmtVM-eth1-int
+      int-virtual-link-desc: internal
+      virtual-network-interface-requirement:
+      - name: mgmtVM-eth1
+        position: 2
+        virtual-interface:
+          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
+  - id: dataVM
+    int-cpd:
+    - id: dataVM-eth0-int
+      int-virtual-link-desc: internal
+      virtual-network-interface-requirement:
+      - name: dataVM-eth0
+        position: 1
+        virtual-interface:
+          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
+  version: '1.0'
+  virtual-compute-desc:
+  - id: mgmtVM-compute
+    virtual-memory:
+      size: 1.0
+    virtual-cpu:
+      num-virtual-cpu: 1
+  - id: dataVM-compute
+    virtual-memory:
+      size: 1.0
+    virtual-cpu:
+      num-virtual-cpu: 1
+  virtual-storage-desc:
+  - id: mgmtVM-storage
+    size-of-storage: 10
+  - id: dataVM-storage
+    size-of-storage: 10

magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/templates/statefulset.yaml

-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: {{ include "eechart.fullname" . }}
-  labels:
-{{ include "eechart.labels" . | indent 4 }}
-spec:
-  serviceName:  {{ include "eechart.fullname" . }} 
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: {{ include "eechart.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: {{ include "eechart.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
-    spec:
-      imagePullSecrets:
-      - name: regcred 
-      serviceAccountName: {{ template "eechart.serviceAccountName" . }}
-      securityContext:
-        runAsUser: 0
-      containers:
-        - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          ports:
-            - name: grpc
-              containerPort: 50051
-              protocol: TCP          
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}          
-          volumeMounts:
-          - name: osm-ee
-            mountPath: /app/storage  
-          - name: osm-ee-source
-            mountPath: /app/EE/osm_ee/vnf      
-{{- if .Values.snmpexporter.enabled }}
-          - name: snmp-config-volume
-            mountPath: /etc/snmp_exporter
-          - name: vnf-mibs
-            mountPath: /root/.snmp/mibs
-          - name: vnf-generator
-            mountPath: /app/vnf/generator
-{{- end }}
-      volumes:      
-      - name: osm-ee-source
-        configMap: 
-          name:  {{ include "eechart.fullname" . }}
-      - name: osm-ee
-        hostPath:
-          path: /var/lib/osm/osm/osm_osm_packages/_data
-{{- if .Values.snmpexporter.enabled }}
-      - name: snmp-config-volume
-        hostPath: 
-          path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/"
-      - name: vnf-mibs
-        configMap:
-          name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}"
-      - name: vnf-generator
-        configMap:
-          name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}"
-{{- end }}
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: {{ include "eechart.fullname" . }}
+  labels:
+{{ include "eechart.labels" . | indent 4 }}
+spec:
+  serviceName:  {{ include "eechart.fullname" . }} 
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "eechart.name" . }}
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: {{ include "eechart.name" . }}
+        app.kubernetes.io/instance: {{ .Release.Name }}
+    spec:
+      imagePullSecrets:
+      - name: regcred 
+      serviceAccountName: {{ template "eechart.serviceAccountName" . }}
+      securityContext:
+        runAsUser: 0
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - name: grpc
+              containerPort: 50051
+              protocol: TCP          
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}          
+          volumeMounts:
+          - name: osm-ee
+            mountPath: /app/storage  
+          - name: osm-ee-source
+            mountPath: /app/EE/osm_ee/vnf      
+{{- if .Values.snmpexporter.enabled }}
+          - name: snmp-config-volume
+            mountPath: /etc/snmp_exporter
+          - name: vnf-mibs
+            mountPath: /root/.snmp/mibs
+          - name: vnf-generator
+            mountPath: /app/vnf/generator
+{{- end }}
+      volumes:      
+      - name: osm-ee-source
+        configMap: 
+          name:  {{ include "eechart.fullname" . }}
+      - name: osm-ee
+        hostPath:
+          path: /var/lib/osm/osm/osm_osm_packages/_data
+{{- if .Values.snmpexporter.enabled }}
+      - name: snmp-config-volume
+        hostPath: 
+          path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/"
+      - name: vnf-mibs
+        configMap:
+          name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}"
+      - name: vnf-generator
+        configMap:
+          name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}"
+{{- end }}

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