Handle changes btw. QoS parms in 1.5 and 1.6

Change-Id: Ife6c68f9ab1d93eb7028c0482cb761350b894ce5
diff --git a/4g-core-values.yaml b/4g-core-values.yaml
index 0d84851..acf50a0 100644
--- a/4g-core-values.yaml
+++ b/4g-core-values.yaml
@@ -16,6 +16,10 @@
     # syncUrl: http://sdcore-adapter-v4.aether-roc.svc:8080/synchronize
   config4g:
     deploy: true
+  hss:
+    bootstrap:
+      users: []
+      staticusers: []
   spgwc:
     pfcp: true
     cfgFiles:
@@ -54,6 +58,16 @@
               dns-primary: "8.8.8.8"
               mtu: 1460
               ue-ip-pool: "172.250.0.0/16"
+              ue-dnn-qos:
+                dnn-mbr-downlink: 20000000
+                dnn-mbr-uplink: 4000000
+                bitrate-unit: bps
+                traffic-class:  #default bearer QCI/ARP
+                  name: "platinum"
+                  qci: 9
+                  arp: 6
+                  pdb: 300
+                  pelr: 6
             site-info: "aiab"
           network-slices:
           - name: "default"
@@ -62,21 +76,11 @@
               sst: 1
             site-device-group:
             - "4g-oaisim-user"
-            applications-information:
-            - app-name: "default-app"
-              end-port: 40000
-              endpoint: "1.1.1.1/32"
-              protocol: 17
-              start-port: 40000
-            deny-applications:
-            - "iot-app-deny"
-            permit-applications:
-            - "iot-app1-permit"
-            - "iot-app2-permit"
-            qos:
-              downlink: 20
-              traffic-class: "platinum"
-              uplink: 40
+            application-filtering-rules:
+            - rule-name: "ALLOW-ALL"
+              priority: 250
+              action: "permit"
+              endpoint: "0.0.0.0/0"
             site-info:
               gNodeBs:
               - name: "aiab-gnb1"