AETHER-724 Add support of running UPF from SRIOV enabled VM

Change-Id: I4d9f337d1a91dedb35934246ba8703553a130820
diff --git a/omec/omec-upf-cni/templates/configmap-sriov-conf.yaml b/omec/omec-upf-cni/templates/configmap-sriov-conf.yaml
index e3e9bbd..72b9bd6 100644
--- a/omec/omec-upf-cni/templates/configmap-sriov-conf.yaml
+++ b/omec/omec-upf-cni/templates/configmap-sriov-conf.yaml
@@ -18,15 +18,23 @@
         {
           "resourceName": "sriov_vfio_access_net",
           "selectors": {
+{{- if hasKey .Values.config.sriov.resourceList.vfio "accessPciAddresses" }}
+              "pciAddresses": {{ toJson .Values.config.sriov.resourceList.vfio.accessPciAddresses }}
+{{- else if hasKey .Values.config.sriov.resourceList.vfio "accessPfNames" }}
               "pfNames": {{ toJson .Values.config.sriov.resourceList.vfio.accessPfNames }},
               "drivers": ["vfio-pci"]
+{{- end }}
           }
         },
         {
           "resourceName": "sriov_vfio_core_net",
           "selectors": {
+{{- if hasKey .Values.config.sriov.resourceList.vfio "corePciAddresses" }}
+              "pciAddresses": {{ toJson .Values.config.sriov.resourceList.vfio.corePciAddresses }}
+{{- else if hasKey .Values.config.sriov.resourceList.vfio "corePfNames" }}
               "pfNames": {{ toJson .Values.config.sriov.resourceList.vfio.corePfNames }},
               "drivers": ["vfio-pci"]
+{{- end }}
           }
         }
 {{- if hasKey .Values.config.sriov.resourceList "netDevice" }}