Add smdp-ples emulator to enable seagull test again

ostelco · Dec 2, 2019 · 3548c39 · 3548c39
1 parent 77d7269
commit 3548c39
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 2 deletions.
diff --git a/docker-compose.seagull.yaml b/docker-compose.seagull.yaml
@@ -23,13 +23,21 @@ services:
       - DATASTORE_EMULATOR_HOST=localhost:9090
       - DATASTORE_PROJECT_ID=${GCP_PROJECT_ID}
       - MANDRILL_API_KEY=
+      - LOCAL_TESTING=true
+      - DB_USER=postgres_user
+      - DB_PASSWORD=postgres_password
+      - DB_URL=postgres:5432/sim-inventory
+      - SMDPLUS_ES2PLUS_ENDPOINT=http://smdp-plus-emulator:8080
       - ACCEPTANCE_TESTING=true
     ports:
       - "9090:8080"
       - "8082:8082"
+      - "8081:8081"
     depends_on:
+      - "ext-auth-provider"
       - "datastore-emulator"
       - "pubsub-emulator"
+      - "smdp-plus-emulator"
       - "neo4j"
     command: ["/bin/bash", "./wait.sh"]
     tmpfs:
@@ -60,7 +68,8 @@ services:
       - PUBSUB_CCA_SUBSCRIPTION_ID=ocsgw-cca-sub
       - PUBSUB_ACTIVATE_SUBSCRIPTION_ID=ocsgw-activate-sub
       - DIAMETER_CONFIG_FILE=server-jdiameter-config.xml
-      - OCS_DATASOURCE_TYPE=Local
+      - OCS_DATASOURCE_TYPE=Proxy
+      - OCS_SECONDARY_DATASOURCE_TYPE=PubSub
       - CONFIG_FOLDER=/config/
       - "JAVA_OPTS=-Xms512m -Xmx1024m -server"
     volumes:
@@ -97,6 +106,25 @@ services:
       - DATASTORE_DATASET=${GCP_PROJECT_ID}
     command: ["gcloud", "beta", "emulators", "datastore", "start", "--host-port=0.0.0.0:8081"]
 
+  ext-auth-provider:
+    container_name: ext-auth-provider
+    build: ext-auth-provider
+
+  smdp-plus-emulator:
+    container_name: smdp-plus-emulator
+    build: sim-administration/sm-dp-plus-emulator
+    ports:
+      - "18080:8080"
+      - "18081:8081"
+
+  postgres:
+    container_name: postgres
+    build:
+      context: sim-administration/postgres
+      dockerfile: Dockerfile
+    tmpfs: "//var/lib/postgresql/data"
+    ports:
+      - "55432:5432"
 
 networks:
   net:

diff --git a/seagull/scenario/ccr-cca.client.multiple-cc-units.init.xml b/seagull/scenario/ccr-cca.client.multiple-cc-units.init.xml
@@ -87,7 +87,15 @@
 
         <avp name="User-Equipment-Info">
           <avp name="User-Equipment-Info-Type" value="0"> </avp>
-          <avp name="User-Equipment-Info-Value" value="38:36:31:39:35:35:30:33:30:37:38:31:30:33:35:36"> </avp>
+          <avp name="User-Equipment-Info-Value" value="3836"> </avp>
+        </avp>
+
+        <avp name="Service-Information">
+          <avp name="PS-Information">
+            <avp name="Called-Station-Id" value="loltel"> </avp>
+            <avp name="3GPP-SGSN-MCC-MNC" value="24201"> </avp>
+            <avp name="3GPP-IMSI-MCC-MNC" value="24201"> </avp>
+          </avp>
         </avp>
 
       </command>