Update Aether MWC Edge configs

Change-Id: I795acd62cb0b5d35e6c43ea6676e1ceb632d1d1e
diff --git a/deployment-configs/aether/apps/production-accelleran-cu-b7-mwc.yaml b/deployment-configs/aether/apps/production-accelleran-cu-b7-mwc.yaml
index ed78824..a2f7554 100644
--- a/deployment-configs/aether/apps/production-accelleran-cu-b7-mwc.yaml
+++ b/deployment-configs/aether/apps/production-accelleran-cu-b7-mwc.yaml
@@ -1,11 +1,20 @@
 images:
   tags:
     initCU: registry.aether.opennetworking.org/aether/pod-init:1.0.0
-    nats: registry.aether.opennetworking.org/accelleran/vran-nats:20190121
-    redis: registry.aether.opennetworking.org/accelleran/vran-redis:20190121
-    vranL3: registry.aether.opennetworking.org/accelleran/vran-l3-fdd:onf-dns
+    nats: registry.aether.opennetworking.org/aether/accelleran-cu-nats-b17:v1.0.0
+    redis: registry.aether.opennetworking.org/aether/accelleran-cu-redis-b17:v1.0.0
+    vranL3: registry.aether.opennetworking.org/aether/accelleran-cu-l3-fdd-b17:v1.0.0
   pullPolicy: IfNotPresent
+
+nodeSelectors:
+  enabled: true
+  accelleranCU:
+    label: omec-dp-b7
+    value: enabled
+
 config:
+  epc:
+    plmnId: 371211
   nats:
     ip: 119.0.0.20
   mme:
diff --git a/deployment-configs/aether/apps/production-accelleran-cu-cbrs-common-mwc.yaml b/deployment-configs/aether/apps/production-accelleran-cu-cbrs-common-mwc.yaml
index 8572747..5e2d521 100644
--- a/deployment-configs/aether/apps/production-accelleran-cu-cbrs-common-mwc.yaml
+++ b/deployment-configs/aether/apps/production-accelleran-cu-cbrs-common-mwc.yaml
@@ -8,6 +8,13 @@
     ricWeb: registry.aether.opennetworking.org/aether/accelleran-cu-ricweb:v1.0.0
     depCheck: registry.aether.opennetworking.org/aether/kubernetes-entrypoint:v0.3.1
   pullPolicy: IfNotPresent
+
+nodeSelectors:
+  enabled: true
+  accelleranCBRSCommon:
+    label: omec-dp-cbrs
+    value: enabled
+
 config:
   nats:
     ip: "119.0.0.20"
diff --git a/deployment-configs/aether/apps/production-accelleran-cu-cbrs-mwc.yaml b/deployment-configs/aether/apps/production-accelleran-cu-cbrs-mwc.yaml
index 46d61ac..655221b 100644
--- a/deployment-configs/aether/apps/production-accelleran-cu-cbrs-mwc.yaml
+++ b/deployment-configs/aether/apps/production-accelleran-cu-cbrs-mwc.yaml
@@ -4,6 +4,13 @@
     vranL3: registry.aether.opennetworking.org/aether/accelleran-cu-l3-tdd:v1.0.2
     depCheck: registry.aether.opennetworking.org/aether/kubernetes-entrypoint:v0.3.1
   pullPolicy: IfNotPresent
+
+nodeSelectors:
+  enabled: true
+  accelleranCBRSCU:
+    label: omec-dp-cbrs
+    value: enabled
+
 config:
   mme:
     ip: "10.168.0.204"
diff --git a/deployment-configs/aether/apps/production-omec-cp-azure.yaml b/deployment-configs/aether/apps/production-omec-cp-azure.yaml
index 29f7039..b0c7a66 100644
--- a/deployment-configs/aether/apps/production-omec-cp-azure.yaml
+++ b/deployment-configs/aether/apps/production-omec-cp-azure.yaml
@@ -1,8 +1,8 @@
 images:
   tags:
     hssdb: "registry.aether.opennetworking.org/c3po-hssdb:1.1.0"
-    hss: "registry.aether.opennetworking.org/c3po-hss:1.1.1-bad"
-    mme: "registry.aether.opennetworking.org/openmme:1.1.1-bad"
+    hss: "registry.aether.opennetworking.org/c3po-hss:1.1.2"
+    mme: "registry.aether.opennetworking.org/openmme:1.1.2"
     spgwc: "registry.aether.opennetworking.org/ngic-cp:1.1.0"
   pullPolicy: "Always"
 
@@ -21,6 +21,16 @@
     ueIpPool:
       ip: 17.0.0.0
       mask: 255.0.0.0
+    cfgFiles:
+      app_config.cfg: |
+        [GLOBAL]
+        NUM_DP_SELECTION_RULES = 1
+        [DP_SELECTION_RULE_1]
+        DPID = 1
+        DPNAME = dp1
+        MCC = 732
+        MNC = 111
+        TAC = 17
   mme:
     cfgFiles:
       config.json:
@@ -39,6 +49,36 @@
     bootstrap:
       enabled: true
       users:
+        - imsi: "315010999912345"
+          msisdn: "1122334455"
+          apn: "apn1"
+          key: "000102030405060708090a0b0c0d0e0f"
+          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
+        - imsi: "315010999912346"
+          msisdn: "1122334455"
+          apn: "apn1"
+          key: "000102030405060708090a0b0c0d0e0f"
+          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
+        - imsi: "315010999912347"
+          msisdn: "1122334455"
+          apn: "apn1"
+          key: "000102030405060708090a0b0c0d0e0f"
+          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
+        - imsi: "315010999912348"
+          msisdn: "1122334455"
+          apn: "apn1"
+          key: "000102030405060708090a0b0c0d0e0f"
+          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
+        - imsi: "315010999912349"
+          msisdn: "1122334455"
+          apn: "apn1"
+          key: "000102030405060708090a0b0c0d0e0f"
+          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
         - imsi: "732111000000420"
           msisdn: "1122334455"
           apn: apn1
diff --git a/deployment-configs/aether/apps/production-omec-cp-gcp.yaml b/deployment-configs/aether/apps/production-omec-cp-gcp.yaml
index 7262df9..3b052ad 100644
--- a/deployment-configs/aether/apps/production-omec-cp-gcp.yaml
+++ b/deployment-configs/aether/apps/production-omec-cp-gcp.yaml
@@ -1,8 +1,8 @@
 images:
   tags:
     hssdb: "registry.aether.opennetworking.org/c3po-hssdb:1.1.0"
-    hss: "registry.aether.opennetworking.org/c3po-hss:1.1.0"
-    mme: "registry.aether.opennetworking.org/openmme:1.1.0"
+    hss: "registry.aether.opennetworking.org/c3po-hss:1.1.2"
+    mme: "registry.aether.opennetworking.org/openmme:1.1.2"
     spgwc: "registry.aether.opennetworking.org/ngic-cp:1.1.0"
   pullPolicy: "Always"
 
diff --git a/deployment-configs/aether/apps/production-omec-dp-mwc-b7.yaml b/deployment-configs/aether/apps/production-omec-dp-mwc-b7.yaml
index 55dcd6f..24f6f3b 100644
--- a/deployment-configs/aether/apps/production-omec-dp-mwc-b7.yaml
+++ b/deployment-configs/aether/apps/production-omec-dp-mwc-b7.yaml
@@ -3,6 +3,12 @@
     spgwu: "registry.aether.opennetworking.org/ngic-dp:1.1.0"
   pullPolicy: "Always"
 
+nodeSelectors:
+  enabled: true
+  spgwu:
+    label: omec-dp-b7
+    value: enabled
+
 config:
   spgwu:
     multiUpfs: true
@@ -16,7 +22,7 @@
       device: "sgi-net"
       # NOTE: set different IP for each edge
       ip: "13.1.1.4/24"
-    dpName: "dp-b17"
+    dpName: "dp1"
 networks:
   sgi:
     # NOTE: set correct gateway for each edge
diff --git a/deployment-configs/aether/apps/production-omec-dp-mwc-cbrs.yaml b/deployment-configs/aether/apps/production-omec-dp-mwc-cbrs.yaml
index 8f79776..febe7c0 100644
--- a/deployment-configs/aether/apps/production-omec-dp-mwc-cbrs.yaml
+++ b/deployment-configs/aether/apps/production-omec-dp-mwc-cbrs.yaml
@@ -3,6 +3,12 @@
     spgwu: "registry.aether.opennetworking.org/ngic-dp:1.1.0"
   pullPolicy: "Always"
 
+nodeSelectors:
+  enabled: true
+  spgwu:
+    label: omec-dp-cbrs
+    value: enabled
+
 config:
   spgwu:
     multiUpfs: true
@@ -16,7 +22,7 @@
       device: "sgi-net"
       # NOTE: set different IP for each edge
       ip: "13.1.1.3/24"
-    dpName: "dp-cbrs"
+    dpName: "dp2"
 networks:
   sgi:
     # NOTE: set correct gateway for each edge