update staging edge configurations & add ocp server as new edge

Change-Id: I90f2cb504c6ef413650e1a6f2e9080a1b9d0445a
diff --git a/deployment-configs/aether/apps/staging-multicluster-accelleran-cbrs-common.yaml b/deployment-configs/aether/apps/staging-multicluster-accelleran-cbrs-common.yaml
index b91deae..49c6ad8 100644
--- a/deployment-configs/aether/apps/staging-multicluster-accelleran-cbrs-common.yaml
+++ b/deployment-configs/aether/apps/staging-multicluster-accelleran-cbrs-common.yaml
@@ -1,3 +1,3 @@
 config:
   nats:
-    ip: "119.0.0.20"
+    ip: "119.0.0.42"
diff --git a/deployment-configs/aether/apps/staging-multicluster-accelleran-cbrs-cu.yaml b/deployment-configs/aether/apps/staging-multicluster-accelleran-cbrs-cu.yaml
index b048ac6..b092538 100644
--- a/deployment-configs/aether/apps/staging-multicluster-accelleran-cbrs-cu.yaml
+++ b/deployment-configs/aether/apps/staging-multicluster-accelleran-cbrs-cu.yaml
@@ -1,3 +1,7 @@
 config:
   mme:
     ip: "10.168.0.192"
+  vranL3:
+    plmnId: "130501"
+    instanceId: "onfcell222"
+    tac: 222
\ No newline at end of file
diff --git a/deployment-configs/aether/apps/staging-omec-cp.yaml b/deployment-configs/aether/apps/staging-omec-cp.yaml
index 4a9aac7..ce40672 100644
--- a/deployment-configs/aether/apps/staging-omec-cp.yaml
+++ b/deployment-configs/aether/apps/staging-omec-cp.yaml
@@ -14,36 +14,53 @@
 
 config:
   clusterDomain: "staging.central"
-  hss:
-    hssdb: cassandra
   spgwc:
+    apn: internet
     multiUpfs: true
-    s1uAddr: "119.0.0.3"
+    s1uAddr: "119.0.0.43"
   mme:
     cfgFiles:
       config.json:
         mme:
           mcc:
-            dig1: 7
-            dig2: 3
-            dig3: 2
+            dig1: 3
+            dig2: 1
+            dig3: 5
           mnc:
             dig1: 1
-            dig2: 1
-            dig3: 1
+            dig2: 0
+            dig3: 0
   hss:
     acl:
       oldTls: "*.staging.central"
     bootstrap:
       enabled: true
       users:
-        - imsi: "732111000000420"
+        - imsi: "315010999912345"
           msisdn: "1122334455"
           apn: "apn1"
           key: "000102030405060708090a0b0c0d0e0f"
           opc: "69d5c2eb2e2e624750541d3bbc692ba5"
           sqn: 135
-        - imsi: "732111000000421"
+        - 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"
diff --git a/deployment-configs/aether/apps/staging-multicluster-omec-dp.yaml b/deployment-configs/aether/apps/staging-omec-dp-staging-nokia.yaml
similarity index 70%
rename from deployment-configs/aether/apps/staging-multicluster-omec-dp.yaml
rename to deployment-configs/aether/apps/staging-omec-dp-staging-nokia.yaml
index 471b578..02b2785 100644
--- a/deployment-configs/aether/apps/staging-multicluster-omec-dp.yaml
+++ b/deployment-configs/aether/apps/staging-omec-dp-staging-nokia.yaml
@@ -10,11 +10,11 @@
       addr: "spgwc-headless.omec.svc.staging.central"
     s1u:
       device: "s1u-net"
-      ip: "119.0.0.3/24"
+      ip: "119.0.0.43/24"
     sgi:
       device: "sgi-net"
-      ip: "13.1.1.3/24"
-    dpName: "dp1"
+      ip: "13.1.1.43/24"
+    dpName: "dp-nokia"
 networks:
   sgi:
-    gateway: "13.1.1.250" # Vyatta router IP
+    gateway: "13.1.1.43" # Vyatta router IP