AETHER-17 Add support of BESS upf to comac-in-a-box

Also converged various configs under config.spgwu

Change-Id: I4f3383bb280494326a417ec6172427f806829f71
diff --git a/omec/omec-user-plane/templates/networks.yaml b/omec/omec-user-plane/templates/networks.yaml
index 40ca04b..d9bd41a 100644
--- a/omec/omec-user-plane/templates/networks.yaml
+++ b/omec/omec-user-plane/templates/networks.yaml
@@ -9,15 +9,15 @@
 kind: NetworkAttachmentDefinition
 metadata:
   name: s1u-net
-{{- if $.Values.networks.sriov.enabled }}
+{{- if $.Values.config.spgwu.sriov.enabled }}
   annotations:
     k8s.v1.cni.cncf.io/resourceName: intel.com/sriov_vfio_s1u_net
 {{- end }}
 spec:
   config: '{
-    "type": {{ .Values.networks.cniPlugin | quote }},
+    "type": {{ .Values.config.spgwu.cniPlugin | quote }},
     "ipam": {
-        "type": {{ .Values.networks.ipam | quote }}
+        "type": {{ .Values.config.spgwu.ipam | quote }}
     }
   }'
 ---
@@ -25,14 +25,14 @@
 kind: NetworkAttachmentDefinition
 metadata:
   name: sgi-net
-{{- if $.Values.networks.sriov.enabled }}
+{{- if $.Values.config.spgwu.sriov.enabled }}
   annotations:
     k8s.v1.cni.cncf.io/resourceName: intel.com/sriov_vfio_sgi_net
 {{- end }}
 spec:
   config: '{
-    "type": {{ .Values.networks.cniPlugin | quote }},
+    "type": {{ .Values.config.spgwu.cniPlugin | quote }},
     "ipam": {
-        "type": {{ .Values.networks.ipam | quote }}
+        "type": {{ .Values.config.spgwu.ipam | quote }}
     }
   }'