AETHER-3366 Remove OVS and simpleovs CNI from UPF

Also make connecting AiaB to external easier

Change-Id: I93e6f2cbbeb68e961e1e466923cc8b5b2a7d5d16
diff --git a/sd-core-4g-values.yaml b/sd-core-4g-values.yaml
index 756d544..0c5b257 100644
--- a/sd-core-4g-values.yaml
+++ b/sd-core-4g-values.yaml
@@ -111,24 +111,27 @@
     repository: "registry.opennetworking.org/docker.io/"
   resources:
     enabled: false
-
   config:
     upf:
-      name: "oaisim"
       sriov:
         enabled: false
       hugepage:
         enabled: false
-      cniPlugin: simpleovs
+      cniPlugin: macvlan
       ipam: static
+      routes:
+        - to: ${NODE_IP}
+          via: 169.254.1.1
+      enb:
+        subnet: ${RAN_SUBNET}
+      access:
+        iface: ${DATA_IFACE}
+      core:
+        iface: ${DATA_IFACE}
       cfgFiles:
         upf.json:
           mode: af_packet
-          cpiface:
-            dnn: "internet"
-            hostname: "upf"
-            enable_ue_ip_alloc: false
-            ue_ip_pool: 172.250.0.0/16
+          hwcksum: true
 
 5g-control-plane:
   enable5G: false